From 8f9643d8f9e12b0d0bc592b1af5313ffaed12ba9 Mon Sep 17 00:00:00 2001
From: Prateek Saxena <prtksxna@gmail.com>
Date: Thu, 7 Jul 2016 10:52:14 +0530
Subject: [PATCH] Pass addModuleStyles an array instead of calling it multiple
 times

Change-Id: Ia359c441714c039c505acd4bd37dd1b52c60b8ea
---
 includes/actions/HistoryAction.php              | 6 ++++--
 includes/api/ApiHelp.php                        | 6 ++++--
 includes/page/ImagePage.php                     | 9 +++++----
 includes/specialpage/ChangesListSpecialPage.php | 6 ++++--
 includes/specials/SpecialContributions.php      | 6 ++++--
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index 700e2016a6..0df372efa3 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -116,8 +116,10 @@ class HistoryAction extends FormlessAction {
 		// Setup page variables.
 		$out->setFeedAppendQuery( 'action=history' );
 		$out->addModules( 'mediawiki.action.history' );
-		$out->addModuleStyles( 'mediawiki.action.history.styles' );
-		$out->addModuleStyles( 'mediawiki.special.changeslist' );
+		$out->addModuleStyles( [
+			'mediawiki.action.history.styles',
+			'mediawiki.special.changeslist',
+		] );
 		if ( $config->get( 'UseMediaWikiUIEverywhere' ) ) {
 			$out = $this->getOutput();
 			$out->addModuleStyles( [
diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index 0f0fbdc564..a3bb6a2a50 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -100,8 +100,10 @@ class ApiHelp extends ApiBase {
 		}
 
 		$out = $context->getOutput();
-		$out->addModuleStyles( 'mediawiki.hlist' );
-		$out->addModuleStyles( 'mediawiki.apihelp' );
+		$out->addModuleStyles( [
+			'mediawiki.hlist',
+			'mediawiki.apihelp',
+		] );
 		if ( !empty( $options['toc'] ) ) {
 			$out->addModules( 'mediawiki.toc' );
 		}
diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index 106911c5fe..13966851b9 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -222,11 +222,12 @@ class ImagePage extends Article {
 				$out->addStyle( $css );
 			}
 		}
-		// always show the local local Filepage.css, bug 29277
-		$out->addModuleStyles( 'filepage' );
 
-		// Add MediaWiki styles for a file page
-		$out->addModuleStyles( 'mediawiki.action.view.filepage' );
+		$out->addModuleStyles( [
+			'filepage', // always show the local local Filepage.css, bug 29277
+			'mediawiki.action.view.filepage', // Add MediaWiki styles for a file page
+		] );
+
 	}
 
 	/**
diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index 6c061b35e0..60f1dd81fa 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -475,9 +475,11 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 	protected function addModules() {
 		$out = $this->getOutput();
 		// Styles and behavior for the legend box (see makeLegend())
-		$out->addModuleStyles( 'mediawiki.special.changeslist.legend' );
+		$out->addModuleStyles( [
+			'mediawiki.special.changeslist.legend',
+			'mediawiki.special.changeslist',
+		] );
 		$out->addModules( 'mediawiki.special.changeslist.legend.js' );
-		$out->addModuleStyles( 'mediawiki.special.changeslist' );
 	}
 
 	protected function getGroupName() {
diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index daf602b4ce..cce88b9c2c 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -37,8 +37,10 @@ class SpecialContributions extends IncludableSpecialPage {
 		$this->setHeaders();
 		$this->outputHeader();
 		$out = $this->getOutput();
-		$out->addModuleStyles( 'mediawiki.special' );
-		$out->addModuleStyles( 'mediawiki.special.changeslist' );
+		$out->addModuleStyles( [
+			'mediawiki.special',
+			'mediawiki.special.changeslist',
+		] );
 		$this->addHelpLink( 'Help:User contributions' );
 
 		$this->opts = [];
-- 
2.20.1